Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest: fix zipping of artifacts to include other zips #84085

Merged
merged 1 commit into from
Jul 8, 2022

Conversation

renatolabs
Copy link
Contributor

@renatolabs renatolabs commented Jul 8, 2022

When artifacts are zipped in preparation for being published to
TeamCity, other zip files are skipped. The idea is that we won't try
to recursively zip artifacts.zip itself, or debug.zip, which is
published separately. However, some tests (notably, tpchvec)
download their own zip files in the logs directory so that they'll
be available for analysis when a test fails.

While there was an intention to skip only top-level zip files (as
indicated by existing comments), the code itself would skip any zip
files found in the artifacts directory. This commit updates the zipping
logic to skip only toplevel zip files, allowing tests to write their
own zip files to the logs directory and have them available for
inspection later.

Release note: None.

When artifacts are zipped in preparation for being published to
TeamCity, other zip files are skipped. The idea is that we won't try
to recursively zip artifacts.zip itself, or debug.zip, which is
published separately. However, some tests (notably, `tpchvec`)
download their own zip files in the `logs` directory so that they'll
be available for analysis when a test fails.

While there was an intention to skip only top-level zip files (as
indicated by existing comments), the code itself would skip any zip
files found in the `logs` directory. This commit updates the zipping
logic to skip only toplevel zip files, allowing tests to write their
own zip files to the `logs` directory and have them available for
inspection later.

Release note: None.
@renatolabs renatolabs added A-testing Testing tools and infrastructure T-testeng TestEng Team labels Jul 8, 2022
@renatolabs renatolabs requested a review from a team as a code owner July 8, 2022 18:12
@renatolabs renatolabs requested review from tbg and removed request for a team July 8, 2022 18:12
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@renatolabs renatolabs requested review from a team and removed request for tbg July 8, 2022 18:12
Copy link
Member

@srosenberg srosenberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@renatolabs
Copy link
Contributor Author

bors r=srosenberg

@craig
Copy link
Contributor

craig bot commented Jul 8, 2022

Build succeeded:

@craig craig bot merged commit 1764aab into cockroachdb:master Jul 8, 2022
@renatolabs renatolabs deleted the fix-artifacts-zip-roachtest branch July 8, 2022 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testing Testing tools and infrastructure T-testeng TestEng Team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants